Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

10x28 changes #376

Merged
merged 44 commits into from
Sep 10, 2024
Merged

10x28 changes #376

merged 44 commits into from
Sep 10, 2024

Conversation

AmoryBlaine
Copy link
Contributor

@AmoryBlaine AmoryBlaine commented Aug 14, 2024 •
edited
Loading

  • Damage multipliers removed from most rifles
  • M4RA, M56 Smartgun, Type 71, Type 71c, PKP all share the same ammo type, 10x28 with a higher base damage than standard ammo.
  • UPP given unique 10x31 ammo that is the same stats wise as 10x28.
  • Updates mapless M4RA variant icons to match M41A palette

@AmoryBlaine
update
acdf62e 
- base M4RA sprite updated
- Map variants disabled
@AmoryBlaine
Update
f9b907b 
- Smartgun lockers only have two drums
- MK1s removed from Platoon leader lockers
- A19 ammo made into a child of base 'heavy' 10x28 ammo for simplicity
- M41 rubber magazine box added
- Rubber rounds now do 5 damage, don't spam people with rubber rounds it hurts
- SG armor can now fit M37 holster and any long guns
- UPP now use 10x31 caseless for the Type 71. It's 10x28 but with more penetration essentially
- UPP GPMG now chambered with 10x31, sharing ammo with Type 71s
@AmoryBlaine
sentry and rifle multipliers
da55a71 
- Rifle damage multipliers removed
- UPP Sentry shares ammo with all UPP weapons
@AmoryBlaine
Update sentry.dm
bcb4e8b 
- UPP sentry drum holds 350 rounds to balance against shared ammo cap and higher platoon damage output compared to marines
@AmoryBlaine
cupola and m56 mounted
e133457 
- Mounted SGs now utilize real 10x28
- Vehicle attachment M56 Cupolas also use 10x28
- All 10x28 sentry variants use same ammo
- irradiated smartgun drums now work with all smartguns
@AmoryBlaine
revert gear preset
70a089b
@AmoryBlaine
Fixes Map error
ad7c5b0
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@GriffinMan4455
Copy link
Contributor

SG's feel fucking awesome, I'm loving this change, especially combined with the SG Belt PR, though I think it'd be nice if the locker had three drums in total, if only so that SG's have a choice of having an ammobearer for just-in-case, or forgoing it in order to have a more customizable loadout
If this were to be merged alongside the sidearm overhaul I'd pog, because as it stands our sidearms are kinda like...eh? Revolver's fun for stun, and it helped me save the Corpsman, but otherwise they chew through a ton of ammo (which is a lot of loadout space) in exchange for not doing a lot, especially with how low SG's are on ammo now.
Sadly I can't speak for how this affects RFN, but from that op they looked fine, at least.

@AmoryBlaine
One step back
5a1e193 
- 10x31 now shares stats with 10x28
- PKP no longer crap- use burst fire for accuracy
- general purpose belt back sprite looks less shit
@AmoryBlaine
I forgor
4ce832d
@AmoryBlaine
revert backpack
95dbac7
@AmoryBlaine
10X31 large ammo box fixed
59fe33a
AmoryBlaine and others added 2 commits August 26, 2024 14:58
@AmoryBlaine @private-tristan
Update code/datums/ammo/bullet/rifle.dm
ab460f6 
Co-authored-by: private-tristan <[email protected]>
@AmoryBlaine
UPP SG base code
da75ac7 
- Adds UPP SG DP-88 in as unspawnable item. Sprites within UPP PR.
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Doubleumc
Doubleumc requested changes Sep 7, 2024
View reviewed changes
Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing icon_state for /obj/item/attachable/uppsmartbarrel in 'icons/obj/items/weapons/guns/attachments/barrel.dmi'.

image
https://github.com/cmss13-devs/cmss13-pve/actions/runs/10650509523/job/29521976191?pr=376

@AmoryBlaine AmoryBlaine changed the title (WIP)10x28 changes 10x28 changes Sep 8, 2024
Doubleumc
Doubleumc previously approved these changes Sep 8, 2024
View reviewed changes
@Doubleumc Doubleumc merged commit d86de15 into cmss13-devs:master Sep 10, 2024
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@private-tristan private-tristan private-tristan left review comments

@Doubleumc Doubleumc Doubleumc left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@AmoryBlaine @cm13-github @GriffinMan4455 @Doubleumc @private-tristan